Merge "Temporarily skip rollback test"